Adding some more functional files and modifying some trivial issues in other files