Solved a few more problems, added a few more libs functions