Some updates in the code

Some minor updates and file merges in the code.