Improve cloaking + scanning. Close #31