Updates and upgrades comments and documentation