More additions and changes to files