more updates to main and doing merge work in tools