#1122: various vocab and position adjustments

opened by thuchacz