fixes + andrew's hull