fixes + cleanup