EmailParser updates, debugging / bug fixes