More math fixes, more controller