got ride of huge try except block
cleaned up package handler & better code comments