v. 0.25, optimisations and performance for single keys, minor refactor etc..