Add some more functions to commit and improve things