Alterations

Made to solve numerous VS Warnings