ActionFinish in the API

Last mile of the ActionFinish function to the API
(and this isn't a reason to nuke the whole call either -- I won't comment every instance of this in the method but they should all be fixed I think)