more Leonard
fixes