Uncomment "OTH" functions
Add and port more of lib