Fixing some errors and style.