Important bug fix wth getByKey, other small additions.