Various updates. Added a "remove" option.