all (i hope) remaining errors