Action framework
Some fixes