Some new changes and a clean up