some fixes, and a big question mark on the spec