jet cleaners and some reorganization to accomodate the new logic
jet cleaners and some reorganization to accomodate the new logic