Updated a few things