last friday commit

everything is working now.