Fixed many mistakes reported by users