Fixed up some of my actor stuff.

Almost passes all the cucumber tests at the moment. Other problems
abound, but I'll get there...