FIxed some things