Major issues fixed