Fix a few number errors and some other minor things