Mostly fixed for desktop use and upgraded to latest modules.