diff --git a/lib/abusetheforce.rb b/lib/abusetheforce.rb
index ba2bac6..eedab5a 100644
--- a/lib/abusetheforce.rb
+++ b/lib/abusetheforce.rb
@@ -296,7 +296,8 @@ module AbuseTheForce
         end
 
         def print
-            puts "#{@name}\t#{@username}\t#{@host}\t#{(@active && 'Active') || ''}"
+            #puts "#{@name}\t#{@username}\t#{@host}\t#{(@active && 'Active') || ''}"
+            puts "#{(@active ? '*' : ' ')} #{@name}\t\t#{@username}\t#{(@host.starts_with?('test') ? 'sandbox' : '')}\t"
         end
     end
 
diff --git a/lib/abusetheforce/cli.rb b/lib/abusetheforce/cli.rb
index 0c3cd83..8580486 100644
--- a/lib/abusetheforce/cli.rb
+++ b/lib/abusetheforce/cli.rb
@@ -112,7 +112,7 @@ module AbuseTheForce
 
         desc "list", "Lists all targets"
         def list()
-            puts "Name\tUsername\tHost"
+            puts "Name\t\tUsername"
 
             Atf_Config.targets.values.each do |target|
                 target.print
@@ -165,6 +165,7 @@ module AbuseTheForce
 
                 zip_path = File.join(Atf_Config.get_project_path, 'staticresources', resource_name + '.resource') 
 
+                # TODO: Find a better place to stare XML templates
                 static_resource_xml = <<-eos
 <?xml version="1.0" encoding="UTF-8"?>
 <StaticResource xmlns="http://soap.sforce.com/2006/04/metadata">