minor code changes and customer requests