Some layering and sizing corrections