Update - fixed a few things ;/