fix references to parse and calculations