controller fixes
Merge remote-tracking branch 'origin/ejaj'
supplier added