- SVC stub
- Updated some comments