* Style and header fixes.