fixed a couple of bugs, with copy and comment