Tweaks for performance, added bookmarklet