fixed names and bugs