Minor Bugfixes and Packages renamed