Updated to latest spec

TODO: get scoring confidence and incorporate line number information