again, some fixes