Cleanup & add some things