wip: cleaning up comments and code, fixed functionality for when you accidently cancel command