friday commit

4 more functions to fix