Running to release

Fix bugs, improve performance, rethink working model.