Clean up, small fixes, and documentation