Updated a bit of stuff