added peekAll and peekAt
fixed merge errors