Bug Fixes for Data Structures + Merge Stuff