various update and clean