Thanks for suggestions! Totally agree and think the gameplay would be better with this modifications. Maybe I implement/test them later.
