fix cleanup
fix autoupdate