Minor improvements. Further understanding of how all this works.