Attached inputlistener + minor tweaks