new parts, minor fixes