cleanup; consistency with the article
change license
license information
allow for special case