Updates to Main

Made the updates container-independent.