minor fixes and comments for future task.