fix remaining issues (hopefully)