yotam: Added documentation, and some aesthetic clean-ups. Forgot file.