updated custom_part to include RESERVED_END again, and some cleanup