major reorg and changes of lpad according to some GH issues