some fixes for better logging and reindex