General Changes all round and clean up