Couple of bug fixes, some comments and some more doc splurge