Fixed a couple of commands that weren't in boxes

Also fixed up some spacing.