Minor fixes and polishing.