Usage, Completed two TODO's and Fixed spotting invisibility.