finalized constants, changed parser to match finalized schema