Some changes I forgot to push

* Unfortunately I completely forgot to commit these changes to
* github but becuase they were made months ago I dont know what
* they do or if they fix any existing problems.