syntax and comment fixes incomplete