Fixed a few small issues with shumput and keyswitch