update/fixes for monkeeeys-desktop
fix merge conflicts