Added several generators, and merged generator commands, and some other
stuff