Commit a lot of improvements