cleaned out old code and fixed reset_location