First fixes to decision making; next step is fixing FPS changes