Updated a few things
thomas did stuff