Debug

Cleaned up Expand methods. Improved object output.