Fix toArray method
Fix toJSON method
Update comments
Update comment