cleanup
Added abbrevation handling, cound possibly be used to enable non english input.