Fixer

Made better names
removed my excess code
added escape event