some minor tweaks and changes, still bookmarklet fuctionality to fix