minor fixes; empty string