More to do comments and cleanup.