more goal style tweaks