Escape Key Working again, minor improvements on Input