minor fixes and tethering