Some new changes and a clean up

New pull request (this time on develop)