Multiple fixes and enhancements
FIxed actrion