update MCPackage constructors

Also clean up TODO's