Reformatting, and lots of changes I forgot.