Fixed syntax inconsistencies; semantics not yet updated