just some fixes