upgraded packages
more minor cleanup