Willbranch

Merge clean ups from git playing.