Added license and misc. changes