fixes + cleanup..