switch to special functions, clean up imports (previous comb issue must have been me breaking something and incopatible objects lieing around).