fixed 20 unexpected type errors or so