API seperation, cleanup, localized golem names (makes Waila happy :D)