more cleanup and ading a new package