Fixed SVACE issues and Code cleanup