Fix key names 

merged @dullroar PR + some fix up