Added <so ..> functionality, fixed typedef mispelling