fixed events emitter and linking bugs upped version