License info added. Minor clean-ups