fixed controller setup bugs