Add Window, correct bugs