final (i hope) error corrections