Added Window, fixed bugs, added features.