General cleanup. New formatting syntax. More cleanup. Documentation. Did I say cleanup ?