Fixes #99 and updates message sending after fixing #127