EOD Updates

Joust fixes and updates