Major problems fixed