fixes mistakes
even more fixes