fix remaining problems + clean up