Uodated a few things