Licensing updates and bugfixes. Getting closer to release