added license header, increased User Experience and handling