more fixes

final, I hope