cleanup. bug fix.