added generator, house cleaning

Got rid of 48 warnings