Time-based fixes, removed unnecessary debug