Hey, thanks for the detailed feedback! Based on what others have said and my own playtesting I definitely agree with both suggestions and they'll definitely be part of the changes in the next build.
