Removed variable subset as a nested class; Fixed bugs associated with change to block_masks
Removed variable subset as a nested class; Fixed bugs associated with change to block_masks

putnampp/clotho,putnampp/clotho,putnampp/clotho