BUG/DOC: fixed bug, and cleaned up some docs while I'm at it