lots of action mode improvements