readjusting some of the packages, general cleanup, etc.