Redo package, package stuff, fixes