some update/cleanup