Small bug fixes; better sample TODOs