not many changes ... tried to get comments working