Refactoring Uplink in progress.
Also corrected misc bugs in EventEmitter and Store.