Alright after a bit of play-testing with friends and listening to feedback i've managed to fix the bugs that i've been made aware of.