EOD Updates

Script fixes and style updates