bugfixes due to merge

K, remove the license stuff then (everything before module.exports