Add auto-update, fix some vars