Some minor changes
More files