updates and clean up