More generic refactored names of hit variables
More work on boss.