minor tweak
completly redone package system