Finished updating to formulr + cosmetics.