major speed improvements
checked in a broken thing, adding spec that catches it
fixed bug in mustplay