Added documentation; Fixed issues with null fields.