input reworked & minor fixes