Save location + bug fix