Polishing and fixing max v bug