Adding logging, fixing location bug.