final updates to finish up the code