Fix some const stuff, format to 80 cols again