desktop improved, all code much improved
nested fix