Comment corrections and function call update.