better formatter

more robust, and detects more games