fix fillers and logging