Main problems fixed