fixes + merges