Minor tweaks and added license