fixed Issues after initial testing