added new types. Fixed commit errors