updated tons of stuff