Fixes and Changes

Forgot What the Were