Updated EVERYTHING, more or less