Make the annotations be an actual dict and other misc fixes
Re-indent and fix markup of spec