Minor modifications, plan to add debug config setting