Updated goal controls

Added goal{} to control goal variables