Fix code indentation.
More work on new serialization/parsing functions. Added more tests.