update and some fixes