adde some fixes