Expand prints

This addresses enhancement #4