fixed merge oddities and comments