Tidying up keys + keywait threshold added