Added three new parts, various tweaks