cleanup tweaks.  need more pipeline tests