Numerous bug fixes. Expanded vm support for EC2.