fixed a few stragglers