Further Tweaks

More commits under the nightwaves and fixes for AI.