bug fixes, experimental window docking