Man, I really have to do some testing..
Brought the oslib up to the new classes and streams.