fix admin preview count; moar cleanup