assorted fixes from camp weeks