Fix stream names, squash w prev commit
Add comments for missing code, squash w prev commit
AppleDouble API cleanup, squash w prev commit
Add some debug messages, remove later