small fixes to take out dependancy on goal