Cleaned up some bugs with sending data