added some fields to model Action, changed some files