Added programmatically obtained EC2 instances. Also slight reorganisation