Check Jordan's tunes for proper start/endParts

Also did some white-space tidying