small fixes + cleaning