Misc improvements
Bug fixes & utilizing TextMarshaller and json.Marshaller