diff --git a/Features.md b/Features.md
index 80f48a4..6c1547c 100644
--- a/Features.md
+++ b/Features.md
@@ -4,32 +4,51 @@ This page details our compliance level with the OpenID Connect specifications.
 
 The following features are fully supported in our current implementation.
 
+### Server
+
 * Authorization code flow
 * Implicit flow
 * UserInfo endpoint
 * Manual client management through an administrator console
-* HTTP Basic Auth for client authentication
+* Client authentication through form parameters, HTTP Basic, and public key JWT assertion
 * Webfinger discovery endpoint
 * OpenID Configuration discovery endpoint
-* JWK public key endpoint
-* Standard scopes: openid, phone, address, email, profile
+* JWK Set public key endpoint
+* Standard scopes: openid, phone, address, email, profile, and offline_access
 * Additional arbitrary scopes
+* Refresh tokens
+* ID Tokens
 * Signed JWT access tokens
-* RSA Signing
-* HMAC Signing
+* RSA Signing (used for all tokens)
 * RSA Encryption
+* HMAC Signing
 * Dynamic registration endpoint
-* Client filter
-* Client filter dynamic registration
-* Account chooser / third party login
 * Request Objects (signed)
 * Introspection Endpoint
 * Revocation Endpoint
 * Token chaining
 
+### Client
+* Authorization code flow
+* UserInfo fetching service (for user details)
+* Form-based authentication
+* Webfinger discovery
+* OpenID Configuration server discovery
+* Request Objects (signed)
+* JWK public key endpoint (for signed request objects)
+* Standard scopes: openid, phone, address, email, profile, offline_access
+* Additional arbitrary scopes
+* Signed JWT access tokens
+* RSA Signing
+* Dynamic registration
+* Account chooser / third party login
+* Introspection Endpoint (through speical token service)
+
 ## Currently unsupported / pending implementation / incomplete
 
-The following features are not supported yet, but will be at some point. If we have a projected target for a given feature it will be listed here; if there is no projected target, that only means that we haven't set a target yet, not that it won't happen. 
+The following features are not supported yet, but will be at some point.
 
-* Session management (FY13)
+* Session management
 * Request File (Signed / Encrypted)
+* ID-token-only request
+* Token chaining client utility library