+ Added option to start with windows
* Small improvements