Fixed many things

Fixed many things