Revised license block to be less intrusive
Cleaning up various changes and checking in for neatness