some small code changes