SYL-95 CHANGED: a lot of small refactorings, ADDED: more specs