safeZone, fixes

fixes #16, fixes #9, fixes #7 (just started)