optimized checkHasSight method, other minor fixes