some minor code changes