Latest source Code with Fixes for messaging and other minor issues