record locations bug
cleanup