more goes fixes