Fixes some number inputs
Adds goal model and controller