added/fixed missing parts