Big edit, fixed references