Added more plugins, fixed style issues.