Some fixed by Ali.