fixes! :D and cleanup