More debugging and comments.