FIX: Fixed array allocation / reference bugs
REF: Removed obsolete file.
ENH: Improved output.