Update & some fixes