Technical Changes

Mostly