Fixing container mass calculation + misc fixes