Lots of tidy u p and adding clearing on quit