Changed abunch of things