Additional doc, cleaned up unit tests a bit