Renew work for project after a small vacation. Minor changes.
Test
Revert "Test"

This reverts commit 2456fbb85f1634c02deea679f43aa51a7b75eaa7.