fixed major windowbuilder issues?