Issue/36

All bugs concerning keymapping I was aware of have been fixed (controls reset was not the only one). But there may be more, as this matter is rather tricky.