gameplay tweaks, distance calculates with size as well, epic final battle
Merge commit 'e7a7eeff9bcda6d5d668235aecbd2834836be734'