more updates, and some tests