Updated documentation and changed some messaging