bug fixes + fixtures