Some More General Command Improvements

@Scavenger managed to remove @Olink's last merge commit which is still part of my repo, so his commit is part of this pull request again, shouldn't cause problems I think.