Containers and pair instances added, Bugs fixed