KB/M controls now and some other fixes