fix remaining issues