Notes added, removed debug code