Basic commands, small fixes