fixes

more small fixes to previous fixes on i and b