assorted fixes from Feedback. Only need design changes now