Misc fixes, clarify data format