License update
Fixed a couple of bugs