Initial style complete.
  Several bug fixes.