Comments, minor code changes