Fix title flashing and fix #25.