Making keyboard selection work better
Tweak build settings etc