Merged in new data structures libraries. Fixed a few make issues.