Bug fix with bookmark and small changes