update to tidy spongy-master