keytometa and glob improvements

Contains the improvements discussed in the already merged pull request #17