goformatted
various fixes