Improving styles and fixing bugs.