various parser enhancements, some successful, some not :)