Bug Fixes and Add License Strings