fix location and small things