did some cleanup and debugging.