Fixed some bug, others remain