added more initiative, fixed some issues