Minor changes
Reverted to previous version
Add bookmark stuff
Minor bug fixes