Smithy in game (not uct), and some renaming and code improvements