Further Comments, errors checks, and clean up