[master] ActionServe class: new callbacks added
[master] some cleanup here