final changes before proper browser testing