lots of major improvements