fixed location and a names bug