fix up keys special a bit more