fixed a lot of stuff and view