EOD Updates

Small bug fixes and updates