Lot's of cleanup based on new docs. Lot's to go.