added bookmarking and created more tests.