Various changes, forgot to commit.