fixed a whole lotta stuff