Moved the stdv preprocessor to a better namespace, minor code fixes