New Files and more fixes