Minor changes...all are checked now!