diff --git a/contracts/token/ERC721/ERC721BasicToken.sol b/contracts/token/ERC721/ERC721BasicToken.sol
index 45a109945..e8d860e11 100644
--- a/contracts/token/ERC721/ERC721BasicToken.sol
+++ b/contracts/token/ERC721/ERC721BasicToken.sol
@@ -208,8 +208,8 @@ contract ERC721BasicToken is ERC721Basic {
 
   /**
   * @dev Internal function to clear current approval and transfer the ownership of a given token ID
-  * @param _from address which you want to send tokens from
-  * @param _to address which you want to transfer the token to
+  * @param _from address from which you want to send tokens
+  * @param _to address which you want to transfer the token
   * @param _tokenId uint256 ID of the token to be transferred
   * @param _data bytes data to send along with a safe transfer check
   * @param _safe bool whether to perform a safe transfer
@@ -267,11 +267,11 @@ contract ERC721BasicToken is ERC721Basic {
   /**
   * @dev Internal function to invoke `onERC721Received` on a target address
   * @dev The call is not executed if the target address is not a contract
-  * @dev Returns whether the call correctly returned the expected magic value
   * @param _from address representing the previous owner of the given token ID
   * @param _to target address that will receive the tokens
   * @param _tokenId uint256 ID of the token to be transferred
   * @param _data bytes optional data to send along with the call
+  * @return whether the call correctly returned the expected magic value
   */
   function checkAndCallSafeTransfer(address _from, address _to, uint256 _tokenId, bytes _data) internal returns (bool) {
     return !_to.isContract() ||
diff --git a/contracts/token/ERC721/ERC721Token.sol b/contracts/token/ERC721/ERC721Token.sol
index aec1a3673..556c184ea 100644
--- a/contracts/token/ERC721/ERC721Token.sol
+++ b/contracts/token/ERC721/ERC721Token.sol
@@ -8,7 +8,7 @@ import "./ERC721BasicToken.sol";
 /**
  * @title Full ERC721 Token
  * This implementation includes all the required and some optional functionality of the ERC721 standard
- * Moreover, it includes approve all functionality using operatable terminology
+ * Moreover, it includes approve all functionality using operator terminology
  * @dev see https://github.com/ethereum/eips/issues/721
  */
 contract ERC721Token is ERC721, ERC721BasicToken {