added and fixed more references