license + extra fixes