fixes from issues