Redo all kinds of things to make things more node/browser friendly.