Minor changes

Update header, use cpp includes, use string