fixes from feedback