Better logging, Grace fixes, formatting fixes.