More parameters and cleaning and stuff.