Made some updates and some small improvements.