More updates
More minor fixes
fix merge
More fixes