fixed a few typing errors and missing using directives