fix compilation
fix hard-coded keys

values provided to macro were not used for the "K61,K49,K33, K30" block