Added out-of-initiative, fixed bugs