Playfair complete, add comments, delete singleton