big fixes, nicer email layout