Some polishing and fixing.