Fixed many bad things