Merged 98fixpackages into 01base and 99cleanup