CLI variant much improved (reading from stdin etc.); new approach for signals introduced, but not fully incorporated yet