Polishing and bug fixes.