More funcs corrected -> passed lots of tests
Cleaned master after merge