Fixed bugs, style issues.