moar fixes + spec text