Fix key names 

merged @dullroar PR #115 + some fix up