Added more packages and a fair number of housekeeping fixes