before pull
some fixes