Updated most stuff