API Updates and Minor Logic Tweaks. Confirmed mostly working in sim.