tank fixed... still fixing rest
more fixes