class parsing improvements - 7/13/13