Further commits of necessary files and modifications