Added Naked Triple in ROW and disabled embryo of SQR
refactored handling of singles to be more general and cleaned up the code a bit