Many major improvements