Updates after feedback #1. Have not reverted changes in the submodules yet