comiting after fixing all major bugs