Added some fixes for recording feedback + other things