Added/Fixed some things