Improvements and style fixes.