Some formatting, windmove added