Chrome bugfix and code clean - should work now