1. Done (Orion User and Programmers Guide)
2. Fixed in 4b1bc1f (CHANGES_NEXT_RELEASE)