Updated some things..

Errors listed as documentation in main — willl try to fix them soon