I will try to implement your suggestions as soon as possible, but sadly I don't have the time at the moment. (Will be away until Sunday in a week). (I will hopefully do more rigorous play testing on my next project to remedy these problems early).
Kind regards
kleinba/Emma