Fixes

Fixes #66 
Fixes #65 
you changed this one, but not some of the earlier ones. Would prefer if all the target blanks were removed if poss.