More funcs corrected -> passed lots of tests