further improve input-handling