fixes to melee last hitting code and final version for release