Additional functions, old Chrome compatibility, tidyup