Fixed a few output bugs
added elb import
added ec2 import