in progress
assorted fixes