Add more documentation

And fix some minor issues, mostly labels in AWS and a small bug in CWS.