clean up and small package fixes