Many fixes! (Sorry. In hurry.)