clarified action handling a bit
misc