Set correct timeout and fix error check routine on keytag module. Version 2.1