adds workaround for big feeds; updates code style a few