CLI: method added, TODO updated, prevented exit by ctrl-c