some errors
more fixes