fix copy/paste mistakes
more fixes