fixed two bugs, #66