Reformat code a bit, change how Unloc names are done, add missing recipes