Fixed printf's, cleanup DEFINE's