minor updates, changed TO DO stuff