Bug Fixes with Initialization

need to fix x/y toggle