Fix the licensing flaw + other minor fixes

Yeah, I sucks at github (too lazy to import it all use the CLI)
Anyway, the flaw is fixed, the test is also a bit optimized and more agressive (.
I also fixed a few more things, but nothing major.