data and debugging

Added the data from a standard run.
Updated/debugged old code
Added some new macros