#1016 Updated user guide
#1037 Cleanup