Renamed equationParse to equation, added TODO, other minor changes