misc commits 5/14