tidy up code and make it speak
fix merge conflicts