fixing lots of bugs related to comments