@@ -14,6 +14,7 @@ This means that it is allowed in an to change the state in such a way that the s
 * minified file moved
 * smaller distro: 74 -> 60 KB unminified, 54 -> 30 KB minified
 * Faster
+* extras.SimpleEventEmitter -> SimpleEventEmitter
 
 # 1.2.4
 
 
@@ -23,7 +23,7 @@ cat src/mobservable.ts | grep -v '^import' | sed -e 's/from.*$//g' >> .build/mob
 ls  src/{core,types,api,utils}/*.ts | xargs awk 'BEGINFILE {print "/* file:", FILENAME, "*/"} {print $0}' | grep -v '^import ' | sed -e 's/^export //g' >> .build/mobservable.ts
 
 # compile, generate declaration, no comments
-tsc -m umd -t es5 -d --removeComments --sourcemap --outDir lib .build/mobservable.ts 
+tsc -m commonjs -t es5 -d --removeComments --sourcemap --outDir lib .build/mobservable.ts 
 
 # idea: strip invariants from compiled result. However, difference is not really significant in speed and size, disabled for now. 
 # cat lib/mobservable.js | grep -v -P '^\s+invariant' > .build/mobservable-prod.js 
 
@@ -26,6 +26,7 @@ registerGlobals();
 
 // TODO: all exports in sync with docs?
 export { Lambda                                               } from "./utils/utils";
+export { SimpleEventEmitter                                   } from "./utils/simpleeventemitter";
 export { ITransitionEvent, IObserverTree, IDependencyTree     } from "./api/extras";
 export { IObservable, IDepTreeNode                            } from "./core/observable";
 export { IDerivation                                          } from "./core/derivation";
@@ -46,8 +47,8 @@ export { ITransformer, createTransformer                      } from "./api/crea
 
 export { untracked                                            } from "./core/globalstate";
 export { transaction                                          } from "./core/transaction";
-export { Reaction } from "./core/reaction";
-
+export { Reaction                                             } from "./core/reaction";
+export { IAtom, Atom                                          } from "./core/atom";
 
 import { isComputingDerivation, resetGlobalState } from "./core/globalstate";
 import { quickDiff } from "./utils/utils";
@@ -58,12 +59,10 @@ export const _ = {
 }
 
 import { ITransitionEvent, IObserverTree, IDependencyTree } from "./api/extras";
-import { SimpleEventEmitter } from "./utils/simpleeventemitter";
 import { getDependencyTree, getObserverTree, trackTransitions, allowStateChanges } from "./api/extras";
 import { Lambda } from "./utils/utils";
 
 export const extras = {
-	SimpleEventEmitter: <any> SimpleEventEmitter,
 	getDependencyTree,
 	getObserverTree,
 	trackTransitions,
 
@@ -3,8 +3,10 @@ var test = require('tape');
 
 test('correct api should be exposed', function(t) {
 	t.deepEquals(Object.keys(mobservable).sort(), [
+		'Atom',
 		'ObservableMap',
 		'Reaction',
+		'SimpleEventEmitter',
 		'_',
 		'asFlat',
 		'asReference',
@@ -29,20 +31,28 @@ test('correct api should be exposed', function(t) {
 		'untracked',
 		'when' 
 	]);
+	t.equals(Object.keys(mobservable).filter(function(key) {
+		return mobservable[key] == undefined;
+	}).length, 0);
 
 	t.deepEquals(Object.keys(mobservable._).sort(), [
 		'quickDiff', 
 		'resetGlobalState'
 	]);
+	t.equals(Object.keys(mobservable._).filter(function(key) {
+		return mobservable._[key] == undefined;
+	}).length, 0);
 
 	t.deepEquals(Object.keys(mobservable.extras).sort(), [
-			'SimpleEventEmitter',
 			'allowStateChanges',
 			'getDependencyTree',
 			'getObserverTree',
 			'isComputingDerivation',
 			'trackTransitions'
 	]);
+	t.equals(Object.keys(mobservable.extras).filter(function(key) {
+		return mobservable.extras[key] == undefined;
+	}).length, 0);
 
 	t.end();
 });