fixed annoying empty iterator bug and added email