Several changes, published alpha on npm