some clean up, put back things I took away by mistake at last cleaning