ostream operators; tweaks to parser refactor