Changes to command checks and other tweaks/comments