Tests and bug fixes.
Typos fixes.
Pkgm not required anymore. Setup added to factoy.