added container moving/history and various fixes