Fixed critical bug, added more commands (including input)