Some fixes, reformatting.