minor changes bug fixes from supervisor