Renamed class of values which have keys to HasKey
Added more lens-like parser-combinators
Added more calls from main to testing parsers