Merged some missing changes and changed back to msvcr100 + max speed compilation