fixed major issues