Made "Action" options mutually exclusive, minor changes to TODOs.