add ServiceProvider
Merge remote-tracking branch 'origin/master'
clean up alignment and fix some code