Some additional commenting and cleanup for recent additions.