Fix comments, organize operations, fix magic number
Fix processing of 'direct' option