more code changes for issues...