just fixes from the last commit from testing