Added bookmarklet and some fixes