added missing atoms + minor changes