Updated all kinds of stuff