Fixed bug which disallowed reading keys without values and a bunch of
other buggies