Comments are now explicit

Mark comments with {* and *}
Update to new comment style