fixed unit container stuff. some other fixes as well.
for pyramid testing