Assorted changes, including javascript detection