Minor changes. Start of Box tool.