many styling improvements