fixing a naming error
correcting a naming and ordering issue
inserting forgotten parameters
Merge pull request #2 from virmitio/master

Tested and verified on the production machines.