Squishiness

Work done to the main version to fix some problems with smaller working
windows.