"Final" commit wrapping up loose ends - removing debug code, getting submit/win to work correctly