Stuff I forgot to commit

Sorry about that