CloudTrail + minor fixes

Something else to merge before 0.6.0 :)