Ok, bookmarks/selections mostly working

Some minor bugs still here