updated references and fixed some stuff!