fixed up bow icons
and cleanup
fixed errors with names
test