Fixed upgrade check and adding of caps.
Remove correct option on uninstall.