Cleanup

Removes two c++ warnings. Improves documentation.