Changes and corrections to package generation so far