Small updates

Start of running
Some cleaning up
Some renaming