Dealing with visual studio
Some minor macro changes