Bug fixing and polishing.