Fixed the arg problems and added a proper instruction manual type thingy
Merge branch 'develop' into SQLFeature