Numerous updates, fixes and licence details added