ycm fixes
peayment and delivery added