Implement edit fixes and misc updates