Various changes, forgot to commit before