Some cleanup; adding static buffer