Fixes and polishing.