Lots of changes I forgot to commit...