EOD Updates

Fixes and style upates