fixed some private issues