More commands, small tweaks