A lot of changes (which I forgot to commit)