minor updates and cleand device tree