fixed final errors, more toto come obviously, but atleast our package isn't red