Cleanup

more goodies. read commit by commit.