refactoring
performance improvements
minor adjustments
adds license