Bug fixes - starting to work on daily email