Fixed several errors and included MetricAlarms (CloudWatch)