new packages. few bugs fixed