fixed refs, moved locinfo