Fix variable names, add uninstall hook.