fixing location issues I noticed