Updated and fixed tons of things