Minor changes to the overall class-structure and improved method of storing element references.