fixed stuff + added key press functionality