changed enum names, tryed to fix some problems