Added And Fixed bugs

Fixed bugs and added escape feature