Minor cleanup and a two new actions