fixed some wrong references