Performance improvements, fixed method/route issue.