Various minor changes. Added LimitWindows.