Add Action logging and some other stuff.