pop fix and general padding