Added updates and correcctions