Squished some bugs for v1.0
Added license