Add :time and :marker fields, make :form default true
Fix comments to be clojure type