updated names and comments