FIxed some problems