cleanup, more info added