keep advancing on syntax-case
final touches, seems to work fine