Bug fixes and tweaks.
Simplified ejection angle calculation for normal == z-axis.