bug fixes and added SVC P and Q