Minor tidying.
Added some new window types to the plugin host demo