Added some new stuff, and tried to fix some VS compile errors without having VS installed