better overlap detection
changed back to simplicity puzzle layout