modified somethings
fixed a little error