Fixed minor bug in SafeToHoist and made some changes suggested by Chris.