fix arrays & more