More debugging output & doc