tidy up packagification
correct Makfile error