GetKeys v1.1

A few small bugfixes....