Fixed 'all' the small stuff with dwarfs