more small code changes