Lots of updates
Added missing file