Update some docblocs and use statements
Fixed CS