EOD Updates

Updates and fixes