Some changes I made and didn't commit some time ago but I'm sure they were a good idea