parsing object classes more properly

10 files changed