fix imports/etc
More updates to package bits