some bug fixes; added class field definition matching
differentiate between private definitions and private functions