actions, fix up couple other things