Torches, more localization, renamed stuff