Finishing touches on fan/vacuum code