fixed entity type issue
fixed a couple #defines and cleaned up logging to match server output