Added files and more fixes