parser is done(fully), minor improvements