.functions: ack, fix o changes that didn't merge for some reason