fixed wrong refences
minor fixes