Final Final updates!

Several tweaks to ensure cross-browser compatibility