fixed minor mess in window constructors