Merge more code and updates