renaming package, tweaks and fixes