Windows fixes
Box: Add [] for vectors and make names consistent
Merge branch 'master' into exact