Final update for release 5.0.0 with just some minor code clean up