should be finished with desktop
a few fixes