All the things! made dependant on VC, cleaned up code a bit