A lot of updates, approaching a v 0.1