updates
cleanup and final changes