Fix & Content Update #1

Fixed package names, more content and clean ups.