Updated with comments to most actions