few fixes and basic key settings