Addresses issues #6 and #7, although I'm not sure I did the noscript option correctly.