You're totally right, tried both ideas out and they improve the game considerably, so, thank you for the nitpicks :)
anytime! :>