Fixed/changed  tons of stuff