872 checkin overhaul

Fixes:
- #872 
- #874
- #877