* Various minor bug fixes for silly mistakes in the code, thanks to the