Merge with previous commit, document FIXIT's in todo for matt mostly, fixed some minor errors. Let me know if the merge went foul.