all spec and acceptance tests now passing, just a few unimportant pending