Make sure the contributions are honored
Cleanups here and there