Minor Updates

Converting the whole project from Visual Basic to C#