Updated the manual and fixed a few things to be consistent with it