Fix input shortcut (maybe); fix 2d dock (see notes)