Adding copyright/license headers; more cleanup