cleaned up
fixed a lot of stuff