some fixes online