Problems with drain and missing first letter fixed