freaking packages
misc improvements