Simple rebuild script
Some basic tidy up
Improve VS build