Lots of changes that I forgot to properly commit