diff --git a/decode_ft8.c b/decode_ft8.c
index 5b58421..cf99d28 100644
--- a/decode_ft8.c
+++ b/decode_ft8.c
@@ -17,8 +17,8 @@
 
 #define LOG_LEVEL LOG_INFO
 
-const int kMin_score = 40; // Minimum sync score threshold for candidates
-const int kMax_candidates = 120;
+const int kMin_score = 20; // Minimum sync score threshold for candidates
+const int kMax_candidates = 160;
 const int kLDPC_iterations = 25;
 
 const int kMax_decoded_messages = 50;
@@ -109,7 +109,7 @@ void extract_power(const float signal[], waterfall_t *power)
             // Extract windowed signal block
             for (int pos = 0; pos < nfft; ++pos)
             {
-                timedata[pos] = window[pos] * signal[(idx_block * block_size) + (pos + time_sub * subblock_size)];
+                timedata[pos] = window[pos] * signal[(idx_block * block_size) + (time_sub * subblock_size) + pos];
             }
 
             kiss_fftr(fft_cfg, timedata, freqdata);
diff --git a/ft8/decode.c b/ft8/decode.c
index 4e1e81d..ce7fb15 100644
--- a/ft8/decode.c
+++ b/ft8/decode.c
@@ -50,20 +50,23 @@ int find_sync(const waterfall_t *power, int num_candidates, candidate_t heap[],
                     {
                         for (int k = 0; k < 7; ++k)
                         {
+                            int block = time_offset + m + k;
                             // Check for time boundaries
-                            if (time_offset + k + m < 0)
+                            if (block < 0)
                                 continue;
-                            if (time_offset + k + m >= power->num_blocks)
+                            if (block >= power->num_blocks)
                                 break;
 
-                            int offset = get_index(power, time_offset + k + m, time_sub, freq_sub, freq_offset);
+                            int offset = get_index(power, block, time_sub, freq_sub, freq_offset);
                             const uint8_t *p8 = power->mag + offset;
 
                             // Weighted difference between the expected and all other symbols
                             // Does not work as well as the alternative score below
-                            // score += 8 * p8[sync_pattern[k]] -
-                            //              p8[0] - p8[1] - p8[2] - p8[3] -
-                            //              p8[4] - p8[5] - p8[6] - p8[7];
+                            score += 8 * p8[kFT8_Costas_pattern[k]] -
+                                     p8[0] - p8[1] - p8[2] - p8[3] -
+                                     p8[4] - p8[5] - p8[6] - p8[7];
+
+                            ++num_symbols;
 
                             // Check only the neighbors of the expected symbol frequency- and time-wise
                             int sm = kFT8_Costas_pattern[k]; // Index of the expected bin
@@ -71,24 +74,26 @@ int find_sync(const waterfall_t *power, int num_candidates, candidate_t heap[],
                             {
                                 // look at one frequency bin lower
                                 score += p8[sm] - p8[sm - 1];
+                                ++num_symbols;
                             }
                             if (sm < 7)
                             {
                                 // look at one frequency bin higher
                                 score += p8[sm] - p8[sm + 1];
+                                ++num_symbols;
                             }
                             if (k > 0)
                             {
                                 // look one symbol back in time
                                 score += p8[sm] - p8[sm - num_alt * power->num_bins];
+                                ++num_symbols;
                             }
                             if (k < 6)
                             {
                                 // look one symbol forward in time
                                 score += p8[sm] - p8[sm + num_alt * power->num_bins];
+                                ++num_symbols;
                             }
-
-                            ++num_symbols;
                         }
                     }
                     score /= num_symbols;
@@ -187,7 +192,6 @@ bool decode(const waterfall_t *power, const candidate_t *cand, message_t *messag
     // Extract CRC and check it
     status->crc_extracted = extract_crc(a91);
     // [1]: 'The CRC is calculated on the source-encoded message, zero-extended from 77 to 82 bits.'
-    // TODO: not sure why the zeroing of message is needed and also why CRC over 96-14 bits?
     a91[9] &= 0xF8;
     a91[10] &= 0x00;
     status->crc_calculated = ft8_crc(a91, 96 - 14);