Fix for missing field and cleanup/comments