Adding some avro detail, adding some fixes