Clean commit, added some features