Revert "Fixed the arg problems and added a proper instruction manual type thingy"

This reverts commit 0e1bbd8d86b83eab2c4fbad1d7848aea5d4c503d.
Revert "Revert \"Fixed the arg problems and added a proper instruction manual type thingy\" This is what happens when silly people do silly things."

This reverts commit 5641b76358b1e3bf27b6a2df65036e32f4e57810.
Merge branch 'tempfix2' into develop