Updated/Added a few things