more code review replies, added some tests for rocks cursor
finished responding to first round of code review comments