add bookmarking support, fix image formats