Reformatted; some build changes.