Updating docs, corrected plural links and code clean up