Minor improvements; passed tests