Added comments, resolved error for missing entries