some fixes from feedback