11/13 events, input, refactored a little