fix errors
more fixes