fixed potential conflict bw events, implemented merchant, cleaned explorer code.