Fixed a number of small bugs, made remaining enumerated fields user-readable.