diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -9,35 +9,56 @@ offered by Amazon Web Services.
 
 Currently, this includes:
 
-- Compute
- - Elastic Compute Cloud (EC2)
- - Elastic MapReduce (EMR)
- - Auto Scaling
-- Content Delivery
- - CloudFront
-- Database
- - SimpleDB
- - Relational Data Services (RDS)
-- Deployment and Management
- - CloudFormation
-- Identity & Access
- - Identity and Access Management (IAM)
-- Messaging
- - Simple Queue Service (SQS)
- - Simple Notificaiton Service (SNS)
- - Simple Email Service (SES)
-- Monitoring
- - CloudWatch
-- Networking
- - Route 53
- - Virtual Private Cloud (VPC)
- - Elastic Load Balancing (ELB)
-- Payments & Billing
- - Flexible Payments Service (FPS)
-- Storage
- - Simple Storage Service (S3)
-- Workforce
- - Mechanical Turk
+* Compute
+
+  * Elastic Compute Cloud (EC2)
+  * Elastic MapReduce (EMR)
+  * Auto Scaling
+
+* Content Delivery
+
+  * CloudFront
+
+* Database
+
+  * SimpleDB
+  * Relational Data Services (RDS)
+
+* Deployment and Management
+
+  * CloudFormation
+
+* Identity & Access
+
+  * Identity and Access Management (IAM)
+
+* Messaging
+
+  * Simple Queue Service (SQS)
+  * Simple Notificaiton Service (SNS)
+  * Simple Email Service (SES)
+
+* Monitoring
+
+  * CloudWatch
+
+* Networking
+
+  * Route 53
+  * Virtual Private Cloud (VPC)
+  * Elastic Load Balancing (ELB)
+
+* Payments & Billing
+
+  * Flexible Payments Service (FPS)
+
+* Storage
+
+  * Simple Storage Service (S3)
+
+* Workforce
+
+  * Mechanical Turk
 
 The boto source repository is at http://github.com/boto
 

diff --git a/docs/source/ref/ecs.rst b/docs/source/ref/ecs.rst
@@ -11,13 +11,6 @@ boto.ecs
    :members:   
    :undoc-members:
 
-boto.iam.response
------------------
-
-.. automodule:: boto.iam.response
-   :members:   
-   :undoc-members:
-
 boto.ecs.item
 ----------------------------
 

diff --git a/docs/source/ref/route53.rst b/docs/source/ref/route53.rst
@@ -5,29 +5,22 @@ route53
 =======
 
 
-boto.route53
-------------
-
-.. automodule:: boto.route53
-   :members:   
-   :undoc-members:
-
 boto.route53.connection
--------------------
+-----------------------
 
 .. automodule:: boto.route53.connection
    :members:   
    :undoc-members:
 
- boto.route53.hostedzone
-----------------------------
+boto.route53.hostedzone
+------------------------
 
 .. automodule:: boto.route53.hostedzone
    :members:   
    :undoc-members:
 
 boto.route53.exception
--------------------------
+----------------------
 
 .. automodule:: boto.route53.exception
    :members:   

diff --git a/docs/source/ref/sts.rst b/docs/source/ref/sts.rst
@@ -11,12 +11,12 @@ boto.sts
    :members:   
    :undoc-members:
 
-.. autoclass:: boto.sts.SNSConnection
+.. autoclass:: boto.sts.STSConnection
    :members:
    :undoc-members:
 
 boto.sts.credentials
-----------------
+--------------------
 
 .. automodule:: boto.sts.credentials
    :members: