Updated a few things (sorry about the merge)