some fixes

didn't try to run yet