yotam: Changes to initial data and some cosmetic changes of sorts