Mostly lint fixes, some translation stuff too