Revert "Revert "Did more small work""

This reverts commit 04beb0eeccfb2be01f58226e1ac9c48bd1e6de95.