Fixed up formatting issues in effects, added cmds

First decently working copy.