working manual-input command, and various fixes